# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1332  -> 1.1333 
#	include/asm-x86_64/agp.h	1.3     -> 1.4    
#	include/asm-parisc/unistd.h	1.10    -> 1.11   
#	include/asm-i386/agp.h	1.2     -> 1.3    
#	include/asm-ppc64/unistd.h	1.23    -> 1.24   
#	include/asm-mips/unistd.h	1.7     -> 1.8    
#	include/asm-alpha/agp.h	1.3     -> 1.4    
#	include/asm-i386/ptrace.h	1.6     -> 1.7    
#	include/asm-sparc/unistd.h	1.21    -> 1.22   
#	include/asm-sparc64/agp.h	1.2     -> 1.3    
#	include/asm-sparc64/unistd.h	1.20    -> 1.21   
#	drivers/char/drm/drm_memory.h	1.10    -> 1.11   
#	arch/i386/kernel/Makefile	1.44    -> 1.45   
#	include/asm-alpha/unistd.h	1.20    -> 1.21   
#	include/asm-m68k/unistd.h	1.9     -> 1.10   
#	drivers/serial/Makefile	1.17    -> 1.18   
#	include/asm-h8300/unistd.h	1.2     -> 1.3    
#	include/asm-m68knommu/unistd.h	1.3     -> 1.4    
#	include/linux/sunrpc/svc.h	1.21    -> 1.22   
#	include/asm-x86_64/unistd.h	1.15    -> 1.16   
#	include/asm-mips64/unistd.h	1.6     -> 1.7    
#	include/asm-sh/unistd.h	1.6     -> 1.7    
#	include/asm-cris/unistd.h	1.11    -> 1.12   
#	drivers/serial/Kconfig	1.10    -> 1.11   
#	    net/sunrpc/svc.c	1.20    -> 1.21   
#	include/asm-arm/unistd.h	1.17    -> 1.18   
#	include/asm-v850/unistd.h	1.7     -> 1.8    
#	include/asm-s390/unistd.h	1.17    -> 1.18   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/06/18	jbarnes@sgi.com	1.1330.1.2
# [PATCH] ia64: bitshift fix
# 
# I think there are other 64p issues in other places, but we found this
# one while doing 2.5 bringup on hardware.
# --------------------------------------------
# 03/06/18	davidm@tiger.hpl.hp.com	1.1333
# More 2.5.72 cleanup/syncing.
# --------------------------------------------
#
diff -Nru a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
--- a/arch/i386/kernel/Makefile	Fri Jun 20 00:38:19 2003
+++ b/arch/i386/kernel/Makefile	Fri Jun 20 00:38:19 2003
@@ -47,7 +47,7 @@
       cmd_syscall = $(CC) -nostdlib $(SYSCFLAGS_$(@F)) \
 		          -Wl,-T,$(filter-out FORCE,$^) -o $@
 
-vsyscall-flags = -shared -s -Wl,-soname=linux-vsyscall.so.1
+vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1
 SYSCFLAGS_vsyscall-sysenter.so	= $(vsyscall-flags)
 SYSCFLAGS_vsyscall-int80.so	= $(vsyscall-flags)
 
diff -Nru a/drivers/char/drm/drm_memory.h b/drivers/char/drm/drm_memory.h
--- a/drivers/char/drm/drm_memory.h	Fri Jun 20 00:38:19 2003
+++ b/drivers/char/drm/drm_memory.h	Fri Jun 20 00:38:19 2003
@@ -32,10 +32,6 @@
 #include <linux/config.h>
 #include <linux/highmem.h>
 #include "drmP.h"
-#include <linux/vmalloc.h>
-
-#include <asm/agp.h>
-#include <asm/tlbflush.h>
 
 /* Cut down version of drm_memory_debug.h, which used to be called
  * drm_memory.h.  If you want the debug functionality, change 0 to 1
diff -Nru a/drivers/serial/Kconfig b/drivers/serial/Kconfig
--- a/drivers/serial/Kconfig	Fri Jun 20 00:38:19 2003
+++ b/drivers/serial/Kconfig	Fri Jun 20 00:38:19 2003
@@ -77,6 +77,14 @@
 	  a module, say M here and read <file:Documentation/modules.txt>.
 	  If unsure, say N.
 
+config SERIAL_8250_ACPI
+	bool "8250/16550 device discovery via ACPI namespace"
+	default y if IA64
+	depends on ACPI_BUS
+	---help---
+	  If you wish to enable serial port discovery via the ACPI
+	  namespace, say Y here.  If unsure, say N.
+
 config SERIAL_8250_HCDP
 	bool "8250/16550 device discovery support via EFI HCDP table"
 	depends on IA64
diff -Nru a/drivers/serial/Makefile b/drivers/serial/Makefile
--- a/drivers/serial/Makefile	Fri Jun 20 00:38:19 2003
+++ b/drivers/serial/Makefile	Fri Jun 20 00:38:19 2003
@@ -9,7 +9,7 @@
 serial-8250-$(CONFIG_PCI) += 8250_pci.o
 serial-8250-$(CONFIG_PNP) += 8250_pnp.o
 serial-8250-$(CONFIG_SERIAL_8250_HCDP) += 8250_hcdp.o
-serial-8250-$(CONFIG_ACPI) += 8250_acpi.o
+serial-8250-$(CONFIG_SERIAL_8250_ACPI) += 8250_acpi.o
 
 obj-$(CONFIG_SERIAL_CORE) += core.o
 obj-$(CONFIG_SERIAL_21285) += 21285.o
diff -Nru a/include/asm-alpha/agp.h b/include/asm-alpha/agp.h
--- a/include/asm-alpha/agp.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-alpha/agp.h	Fri Jun 20 00:38:19 2003
@@ -10,11 +10,4 @@
 #define flush_agp_mappings() 
 #define flush_agp_cache() mb()
 
-/*
- * Page-protection value to be used for AGP memory mapped into kernel space.  For
- * platforms which use coherent AGP DMA, this can be PAGE_KERNEL.  For others, it needs to
- * be an uncached mapping (such as write-combining).
- */
-#define PAGE_AGP			PAGE_KERNEL
-
 #endif
diff -Nru a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h
--- a/include/asm-alpha/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-alpha/unistd.h	Fri Jun 20 00:38:19 2003
@@ -616,8 +616,6 @@
 
 #endif /* __KERNEL_SYSCALLS__ */
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -630,25 +628,4 @@
  */
 #define cond_syscall(x) asmlinkage long x() __attribute__((weak,alias("sys_ni_syscall")));
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On alpha, we can clear the user's pt_regs->r0 to force a successful syscall.
- *
- * XXX TODO: if kernel-only threads do not have a dummy pt_regs structure at the top
- *	     of the stack, this would cause kernel stack corruption.  Either check
- *	     first that we're not dealing with a kernel thread or change the kernel
- *	     stacks to allocate a dummy pt_regs structure.
- */
-#define alpha_task_regs(task)	((struct pt_regs *) ((long) task->thread_info + PAGE_SIZE) - 1)
-#define force_successful_syscall_return()	(alpha_task_regs(current)->r0 = 0)
-
-#endif /* __KERNEL__ */
 #endif /* _ALPHA_UNISTD_H */
diff -Nru a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h
--- a/include/asm-arm/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-arm/unistd.h	Fri Jun 20 00:38:19 2003
@@ -483,8 +483,6 @@
 
 #endif
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -493,19 +491,4 @@
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On ARM, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif /* __ASM_ARM_UNISTD_H */
diff -Nru a/include/asm-cris/unistd.h b/include/asm-cris/unistd.h
--- a/include/asm-cris/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-cris/unistd.h	Fri Jun 20 00:38:19 2003
@@ -381,8 +381,6 @@
 
 #endif
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -391,19 +389,4 @@
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On CRIS, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif /* _ASM_CRIS_UNISTD_H_ */
diff -Nru a/include/asm-h8300/unistd.h b/include/asm-h8300/unistd.h
--- a/include/asm-h8300/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-h8300/unistd.h	Fri Jun 20 00:38:19 2003
@@ -451,8 +451,6 @@
 
 #endif
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  */
@@ -460,19 +458,4 @@
   asm (".weak\t_" #name "\n"				\
        ".set\t_" #name ",_sys_ni_syscall");
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On H8300, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif /* _ASM_H8300_UNISTD_H_ */
diff -Nru a/include/asm-i386/agp.h b/include/asm-i386/agp.h
--- a/include/asm-i386/agp.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-i386/agp.h	Fri Jun 20 00:38:19 2003
@@ -20,11 +20,4 @@
    worth it. Would need a page for it. */
 #define flush_agp_cache() asm volatile("wbinvd":::"memory")
 
-/*
- * Page-protection value to be used for AGP memory mapped into kernel space.  For
- * platforms which use coherent AGP DMA, this can be PAGE_KERNEL.  For others, it needs to
- * be an uncached mapping (such as write-combining).
- */
-#define PAGE_AGP			PAGE_KERNEL_NOCACHE
-
 #endif
diff -Nru a/include/asm-i386/ptrace.h b/include/asm-i386/ptrace.h
--- a/include/asm-i386/ptrace.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-i386/ptrace.h	Fri Jun 20 00:38:19 2003
@@ -57,7 +57,6 @@
 #ifdef __KERNEL__
 #define user_mode(regs) ((VM_MASK & (regs)->eflags) || (3 & (regs)->xcs))
 #define instruction_pointer(regs) ((regs)->eip)
-#define force_successful_syscall_return()	do { } while (0)
 #endif
 
 #endif
diff -Nru a/include/asm-m68k/unistd.h b/include/asm-m68k/unistd.h
--- a/include/asm-m68k/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-m68k/unistd.h	Fri Jun 20 00:38:19 2003
@@ -365,8 +365,6 @@
 
 #endif
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -375,19 +373,4 @@
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On m68k, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif /* _ASM_M68K_UNISTD_H_ */
diff -Nru a/include/asm-m68knommu/unistd.h b/include/asm-m68knommu/unistd.h
--- a/include/asm-m68knommu/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-m68knommu/unistd.h	Fri Jun 20 00:38:19 2003
@@ -409,8 +409,6 @@
 
 #endif
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -419,19 +417,4 @@
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On m68knommu, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif /* _ASM_M68K_UNISTD_H_ */
diff -Nru a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h
--- a/include/asm-mips/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-mips/unistd.h	Fri Jun 20 00:38:19 2003
@@ -481,8 +481,6 @@
 #endif /* !defined (__KERNEL_SYSCALLS__) */
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -491,19 +489,4 @@
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On MIPS, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif /* _ASM_UNISTD_H */
diff -Nru a/include/asm-mips64/unistd.h b/include/asm-mips64/unistd.h
--- a/include/asm-mips64/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-mips64/unistd.h	Fri Jun 20 00:38:19 2003
@@ -807,8 +807,6 @@
 #endif /* !defined (__KERNEL_SYSCALLS__) */
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -816,21 +814,5 @@
  * but it doesn't work on all toolchains, so we just do it by hand
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
-
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On MIPS64, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 
 #endif /* _ASM_UNISTD_H */
diff -Nru a/include/asm-parisc/unistd.h b/include/asm-parisc/unistd.h
--- a/include/asm-parisc/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-parisc/unistd.h	Fri Jun 20 00:38:19 2003
@@ -910,8 +910,6 @@
 
 #undef STR
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -920,19 +918,4 @@
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On PA-RISC, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif /* _ASM_PARISC_UNISTD_H_ */
diff -Nru a/include/asm-ppc64/unistd.h b/include/asm-ppc64/unistd.h
--- a/include/asm-ppc64/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-ppc64/unistd.h	Fri Jun 20 00:38:19 2003
@@ -390,8 +390,6 @@
 
 #endif /* __KERNEL_SYSCALLS__ */
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -399,23 +397,6 @@
  * but it doesn't work on all toolchains, so we just do it by hand
  */
 #define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",.sys_ni_syscall");
-
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On PPC64, the syscall error flag is returned via the SO bit in CR, but for now there is
- * no way to force that bit to zero, so we do nothing here.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 
 #endif		/* __ASSEMBLY__ */
 
diff -Nru a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h
--- a/include/asm-s390/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-s390/unistd.h	Fri Jun 20 00:38:19 2003
@@ -537,8 +537,6 @@
 
 #endif
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -546,21 +544,5 @@
  * but it doesn't work on all toolchains, so we just do it by hand
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
-
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On S390, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 
 #endif /* _ASM_S390_UNISTD_H_ */
diff -Nru a/include/asm-sh/unistd.h b/include/asm-sh/unistd.h
--- a/include/asm-sh/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-sh/unistd.h	Fri Jun 20 00:38:19 2003
@@ -360,8 +360,6 @@
 
 #endif
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -370,19 +368,4 @@
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On SH, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif /* __ASM_SH_UNISTD_H */
diff -Nru a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
--- a/include/asm-sparc/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-sparc/unistd.h	Fri Jun 20 00:38:19 2003
@@ -428,8 +428,6 @@
 
 #endif /* __KERNEL_SYSCALLS__ */
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -438,20 +436,4 @@
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On SPARC, the syscall error flag is returned via the carry condition code, but for now
- * there is now way to force that bit to bo zero, so we do nothing here.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif /* _SPARC_UNISTD_H */
diff -Nru a/include/asm-sparc64/agp.h b/include/asm-sparc64/agp.h
--- a/include/asm-sparc64/agp.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-sparc64/agp.h	Fri Jun 20 00:38:19 2003
@@ -8,11 +8,4 @@
 #define flush_agp_mappings() 
 #define flush_agp_cache() mb()
 
-/*
- * Page-protection value to be used for AGP memory mapped into kernel space.  For
- * platforms which use coherent AGP DMA, this can be PAGE_KERNEL.  For others, it needs to
- * be an uncached mapping (such as write-combining).
- */
-#define PAGE_AGP			PAGE_KERNEL_NOCACHE
-
 #endif
diff -Nru a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
--- a/include/asm-sparc64/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-sparc64/unistd.h	Fri Jun 20 00:38:19 2003
@@ -432,8 +432,6 @@
 #define   _SC_VERSION             8
 #endif
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -442,20 +440,4 @@
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On SPARC, the syscall error flag is returned via the carry condition code, but for now
- * there is now way to force that bit to bo zero, so we do nothing here.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif /* _SPARC64_UNISTD_H */
diff -Nru a/include/asm-v850/unistd.h b/include/asm-v850/unistd.h
--- a/include/asm-v850/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-v850/unistd.h	Fri Jun 20 00:38:19 2003
@@ -419,8 +419,6 @@
 
 #endif
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  */
@@ -434,19 +432,4 @@
   void name (void) __attribute__ ((weak, alias ("sys_ni_syscall")));
 #endif
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On v850, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif /* __V850_UNISTD_H__ */
diff -Nru a/include/asm-x86_64/agp.h b/include/asm-x86_64/agp.h
--- a/include/asm-x86_64/agp.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-x86_64/agp.h	Fri Jun 20 00:38:19 2003
@@ -20,11 +20,4 @@
    worth it. Would need a page for it. */
 #define flush_agp_cache() asm volatile("wbinvd":::"memory")
 
-/*
- * Page-protection value to be used for AGP memory mapped into kernel space.  For
- * platforms which use coherent AGP DMA, this can be PAGE_KERNEL.  For others, it needs to
- * be an uncached mapping (such as write-combining).
- */
-#define PAGE_AGP			PAGE_KERNEL_NOCACHE
-
 #endif
diff -Nru a/include/asm-x86_64/unistd.h b/include/asm-x86_64/unistd.h
--- a/include/asm-x86_64/unistd.h	Fri Jun 20 00:38:19 2003
+++ b/include/asm-x86_64/unistd.h	Fri Jun 20 00:38:19 2003
@@ -701,8 +701,6 @@
 
 #endif /* __NO_STUBS */
 
-#ifdef __KERNEL__
-
 /*
  * "Conditional" syscalls
  *
@@ -711,19 +709,4 @@
  */
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
 
-/*
- * System call handlers that, upon successful completion, need to return a negative value
- * should call force_successful_syscall_return() right before returning.  On architectures
- * where the syscall convention provides for a separate error flag (e.g., alpha, ia64,
- * ppc{,64}, sparc{,64}, possibly others), this macro can be used to ensure that the error
- * flag will not get set.  On architectures which do not support a separate error flag,
- * the macro is a no-op and the spurious error condition needs to be filtered out by some
- * other means (e.g., in user-level, by passing an extra argument to the syscall handler,
- * or something along those lines).
- *
- * On x86-64, this is a no-op.
- */
-#define force_successful_syscall_return()
-
-#endif /* __KERNEL__ */
 #endif
diff -Nru a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
--- a/include/linux/sunrpc/svc.h	Fri Jun 20 00:38:19 2003
+++ b/include/linux/sunrpc/svc.h	Fri Jun 20 00:38:19 2003
@@ -73,7 +73,7 @@
  * This assumes that the non-page part of an rpc reply will fit
  * in a page - NFSd ensures this.  lockd also has no trouble.
  */
-#define RPCSVC_MAXPAGES		((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 2)
+#define RPCSVC_MAXPAGES		((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 1)
 
 static inline u32 svc_getu32(struct iovec *iov)
 {
diff -Nru a/net/sunrpc/svc.c b/net/sunrpc/svc.c
--- a/net/sunrpc/svc.c	Fri Jun 20 00:38:19 2003
+++ b/net/sunrpc/svc.c	Fri Jun 20 00:38:19 2003
@@ -111,7 +111,7 @@
 static int
 svc_init_buffer(struct svc_rqst *rqstp, unsigned int size)
 {
-	int pages = 2 + (size+ PAGE_SIZE -1) / PAGE_SIZE;
+	int pages = 1 + (size+ PAGE_SIZE -1) / PAGE_SIZE;
 	int arghi;
 	
 	rqstp->rq_argused = 0;